From 52bf5773ab3d9a129ca29fdf973803f63acad8dd Mon Sep 17 00:00:00 2001
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date: Wed, 22 Sep 2010 17:52:34 +0100
Subject: [PATCH] Config.mk et al: introduce XEN_LOCK_DIR

Introduce a OS dependent global variable XEN_LOCK_DIR that points at the
system directory that contains lock files.

[fixed up for conflict in Config.mk -iwj]

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Config.mk                 | 1 +
 config/NetBSD.mk          | 6 ++++++
 config/StdGNU.mk          | 2 ++
 tools/libxl/libxl.h       | 1 +
 tools/libxl/libxl_paths.c | 4 ++++
 5 files changed, 14 insertions(+)

diff --git a/Config.mk b/Config.mk
index 33a2635249..d4e091cb65 100644
--- a/Config.mk
+++ b/Config.mk
@@ -130,6 +130,7 @@ define buildmakevars2file-closure
 	echo "XENFIRMWAREDIR=\"$(XENFIRMWAREDIR)\"" >> $(1).tmp;           \
 	echo "XEN_CONFIG_DIR=\"$(XEN_CONFIG_DIR)\"" >> $(1).tmp;           \
 	echo "XEN_SCRIPT_DIR=\"$(XEN_SCRIPT_DIR)\"" >> $(1).tmp;           \
+	echo "XEN_LOCK_DIR=\"$(XEN_LOCK_DIR)\"" >> $(1).tmp;               \
 	if ! cmp $(1).tmp $(1); then mv -f $(1).tmp $(1); fi
 endef
 
diff --git a/config/NetBSD.mk b/config/NetBSD.mk
index 73b61577c6..6245259761 100644
--- a/config/NetBSD.mk
+++ b/config/NetBSD.mk
@@ -7,4 +7,10 @@ LIBLEAFDIR_x86_64 = lib
 LIBEXEC = $(PREFIX)/libexec
 PRIVATE_BINDIR = $(BINDIR)
 
+ifeq ($(PREFIX),/usr)
+XEN_LOCK_DIR = /var/lib
+else
+XEN_LOCK_DIR = $(PREFIX)/var/lib
+endif
+
 WGET = ftp
diff --git a/config/StdGNU.mk b/config/StdGNU.mk
index 89267b2c48..0b1e0382d6 100644
--- a/config/StdGNU.mk
+++ b/config/StdGNU.mk
@@ -45,8 +45,10 @@ PRIVATE_BINDIR = $(PRIVATE_PREFIX)/bin
 
 ifeq ($(PREFIX),/usr)
 CONFIG_DIR = /etc
+XEN_LOCK_DIR = /var/lock
 else
 CONFIG_DIR = $(PREFIX)/etc
+XEN_LOCK_DIR = $(PREFIX)/var/lock
 endif
 
 SYSCONFIG_DIR = $(CONFIG_DIR)/$(CONFIG_LEAF_DIR)
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index 47ab5d253f..c1c40b1381 100644
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -508,6 +508,7 @@ const char *libxl_private_bindir_path(void);
 const char *libxl_xenfirmwaredir_path(void);
 const char *libxl_xen_config_dir_path(void);
 const char *libxl_xen_script_dir_path(void);
+const char *libxl_lock_dir_path(void);
 
 #endif /* LIBXL_H */
 
diff --git a/tools/libxl/libxl_paths.c b/tools/libxl/libxl_paths.c
index b9783d7c20..9c2bd060b9 100644
--- a/tools/libxl/libxl_paths.c
+++ b/tools/libxl/libxl_paths.c
@@ -60,3 +60,7 @@ const char *libxl_xen_script_dir_path(void)
     return XEN_SCRIPT_DIR;
 }
 
+const char *libxl_lock_dir_path(void)
+{
+    return XEN_LOCK_DIR;
+}
-- 
2.30.2